Move the GtkApplication example to the right place

diff --git a/examples/Makefile.am b/examples/Makefile.am
index f15e35d7dc20aad1f0707489a91d488a4292ece6..2d2a491695de552c2a934680d313845fd1eb0cbc 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -48,4 +48,4 @@ LDADD = \
        $(top_builddir)/gtk/libgtk-3.0.la       \
        $(GTK_DEP_LIBS)
 
-noinst_PROGRAMS = hello-world window-default
+noinst_PROGRAMS = hello-world window-default bloatpad

diff --git a/examples/bloatpad.c b/examples/bloatpad.c
new file mode 100644 (file)
index 0000000..b2cff86
--- /dev/null
+++ b/examples/bloatpad.c
@@ -0,0 +1,100 @@
+#include <gtk/gtk.h>
+
+static void
+new_window (GApplication *app,
+            GFile        *file)
+{
+  GtkWidget *window, *scrolled, *view;
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (app));
+  gtk_window_set_title (GTK_WINDOW (window), "Bloatpad");
+  scrolled = gtk_scrolled_window_new (NULL, NULL);
+  view = gtk_text_view_new ();
+  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_container_add (GTK_CONTAINER (window), scrolled);
+
+  if (file != NULL)
+    {
+      gchar *contents;
+      gsize length;
+
+      if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))
+        {
+          GtkTextBuffer *buffer;
+
+          buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+          gtk_text_buffer_set_text (buffer, contents, length);
+          g_free (contents);
+        }
+    }
+
+  gtk_widget_show_all (GTK_WIDGET (window));
+}
+
+static void
+bloat_pad_activate (GApplication *application)
+{
+  new_window (application, NULL);
+}
+
+static void
+bloat_pad_open (GApplication  *application,
+                GFile        **files,
+                gint           n_files,
+                const gchar   *hint)
+{
+  gint i;
+
+  for (i = 0; i < n_files; i++)
+    new_window (application, files[i]);
+}
+
+typedef GtkApplication BloatPad;
+typedef GtkApplicationClass BloatPadClass;
+
+G_DEFINE_TYPE (BloatPad, bloat_pad, GTK_TYPE_APPLICATION)
+
+static void
+bloat_pad_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (bloat_pad_parent_class)->finalize (object);
+}
+
+static void
+bloat_pad_init (BloatPad *app)
+{
+}
+
+static void
+bloat_pad_class_init (BloatPadClass *class)
+{
+  G_OBJECT_CLASS (class)->finalize= bloat_pad_finalize;
+
+  G_APPLICATION_CLASS (class)->activate = bloat_pad_activate;
+  G_APPLICATION_CLASS (class)->open = bloat_pad_open;
+}
+
+BloatPad *
+bloat_pad_new (void)
+{
+  g_type_init ();
+
+  return g_object_new (bloat_pad_get_type (),
+                       "application-id", "org.gtk.Test.bloatpad",
+                       "flags", G_APPLICATION_HANDLES_OPEN,
+                       NULL);
+}
+
+int
+main (int argc, char **argv)
+{
+  BloatPad *bloat_pad;
+  int status;
+
+  bloat_pad = bloat_pad_new ();
+  status = g_application_run (G_APPLICATION (bloat_pad), argc, argv);
+  g_object_unref (bloat_pad);
+
+  return status;
+}

diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 90d4adfca881751d948fad3d8b557fc1435b3b1a..2d68b0994fb4037474d313b1a5d32350d2d30427 100644 (file)
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -53,7 +53,7 @@
  *
  * <example id="gtkapplication"><title>A simple application</title>
  * <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../gtk/tests/gtk-example-application.c">
+ * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/bloatpad.c">
  *  <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
  * </xi:include>
  * </programlisting>

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 994d7161467ec9d0be197e6219165d5e917650a2..008823cf94d50d5082969cde77733b87e08b9e5a 100644 (file)
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -18,7 +18,7 @@ progs_ldadd = \
        $(top_builddir)/gdk/libgdk-3.0.la       \
        $(GTK_DEP_LIBS)
 
-noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
+noinst_PROGRAMS = $(TEST_PROGS)
 
 
 TEST_PROGS                     += testing
@@ -96,10 +96,6 @@ TEST_PROGS                   += action
 action_SOURCES                  = action.c
 action_LDADD                    = $(progs_ldadd)
 
-SAMPLE_PROGS = gtk-example-application
-gtk_example_application_SOURCES        = gtk-example-application.c
-gtk_example_application_LDADD  = $(progs_ldadd)
-
 TEST_PROGS                     += stylecontext
 stylecontext_SOURCES            = stylecontext.c
 stylecontext_LDADD              = $(progs_ldadd)

diff --git a/gtk/tests/gtk-example-application.c b/gtk/tests/gtk-example-application.c
deleted file mode 100644 (file)
index b2cff86..0000000
--- a/gtk/tests/gtk-example-application.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#include <gtk/gtk.h>
-
-static void
-new_window (GApplication *app,
-            GFile        *file)
-{
-  GtkWidget *window, *scrolled, *view;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (app));
-  gtk_window_set_title (GTK_WINDOW (window), "Bloatpad");
-  scrolled = gtk_scrolled_window_new (NULL, NULL);
-  view = gtk_text_view_new ();
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_container_add (GTK_CONTAINER (window), scrolled);
-
-  if (file != NULL)
-    {
-      gchar *contents;
-      gsize length;
-
-      if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))
-        {
-          GtkTextBuffer *buffer;
-
-          buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-          gtk_text_buffer_set_text (buffer, contents, length);
-          g_free (contents);
-        }
-    }
-
-  gtk_widget_show_all (GTK_WIDGET (window));
-}
-
-static void
-bloat_pad_activate (GApplication *application)
-{
-  new_window (application, NULL);
-}
-
-static void
-bloat_pad_open (GApplication  *application,
-                GFile        **files,
-                gint           n_files,
-                const gchar   *hint)
-{
-  gint i;
-
-  for (i = 0; i < n_files; i++)
-    new_window (application, files[i]);
-}
-
-typedef GtkApplication BloatPad;
-typedef GtkApplicationClass BloatPadClass;
-
-G_DEFINE_TYPE (BloatPad, bloat_pad, GTK_TYPE_APPLICATION)
-
-static void
-bloat_pad_finalize (GObject *object)
-{
-  G_OBJECT_CLASS (bloat_pad_parent_class)->finalize (object);
-}
-
-static void
-bloat_pad_init (BloatPad *app)
-{
-}
-
-static void
-bloat_pad_class_init (BloatPadClass *class)
-{
-  G_OBJECT_CLASS (class)->finalize= bloat_pad_finalize;
-
-  G_APPLICATION_CLASS (class)->activate = bloat_pad_activate;
-  G_APPLICATION_CLASS (class)->open = bloat_pad_open;
-}
-
-BloatPad *
-bloat_pad_new (void)
-{
-  g_type_init ();
-
-  return g_object_new (bloat_pad_get_type (),
-                       "application-id", "org.gtk.Test.bloatpad",
-                       "flags", G_APPLICATION_HANDLES_OPEN,
-                       NULL);
-}
-
-int
-main (int argc, char **argv)
-{
-  BloatPad *bloat_pad;
-  int status;
-
-  bloat_pad = bloat_pad_new ();
-  status = g_application_run (G_APPLICATION (bloat_pad), argc, argv);
-  g_object_unref (bloat_pad);
-
-  return status;
-}